auto merge of #894 : alexcrichton/cargo/issue-888, r=brson
authorbors <bors@rust-lang.org>
Tue, 18 Nov 2014 18:44:31 +0000 (18:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 18 Nov 2014 18:44:31 +0000 (18:44 +0000)

Trivial merge